Merge from trunk
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 28 Dec 2011 20:39:45 +0000 (12:39 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 28 Dec 2011 20:39:45 +0000 (12:39 -0800)

Trivial merge